Merge branch 'google_calendar' of github.com:CloCkWeRX/huginn into google_calendar

Conflicts:
Gemfile.lock
app/models/agents/google_calendar_publish_agent.rb
lib/google_calendar.rb

Daniel O'Connor преди 10 години
родител
ревизия
658962ceaf

Няма данни за разлики.